fix error detection for osx script, allow macOS sed for mkstyle. (#615)

diff --git a/mkstyle.sh b/mkstyle.sh
index 1471a77056602b57bfc15d9615d554c859090df0..af821b0d1d4333642c95fd409a842603e9df0d53 100755 (executable)
--- a/mkstyle.sh
+++ b/mkstyle.sh
@@ -16,6 +16,12 @@ if gsed v /dev/null 1>/dev/null 2>&1; then
 elif sed v /dev/null 1>/dev/null 2>&1; then
   # sed is gnu sed
   SED=sed
+elif [ "$(uname -s)" = "Darwin" ]; then
+  # BSD sed is usually fine, but if a style file is encoded in ISO-8859 then it
+  # can echo a warning "sed: RE error: illegal byte sequence" to stderr and the
+  # output can be corrupted, while return exit status 0.  Since we no longer use
+  # this encoding for style files allow Darwin's sed.
+  SED=/usr/bin/sed
 elif [ "$(uname -s)" = "FreeBSD" ]; then
   # BSD sed is fine
   SED=/usr/bin/sed

diff --git a/tools/travis_script_osx b/tools/travis_script_osx
index 98a3e2cbf9d579b49ee31a9fe92edac28c28ea3e..db91d4a55d146bec3e5630d5287f244836771c60 100755 (executable)
--- a/tools/travis_script_osx
+++ b/tools/travis_script_osx
@@ -14,11 +14,14 @@ VERSIONID=${VERSIONID:-$(date -ju -f %Y-%m-%dT%H:%M:%S%z $(git show -s --format=
 "$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd)"/ci_tokens
 
 # build and test the CLI
-$QMAKE GPSBabel.pro && make -j 2 && make check
+$QMAKE GPSBabel.pro
+make -j 3
+make check
 
 # build the GUI
 pushd gui
-$QMAKE app.pro && make -j 2
+$QMAKE app.pro
+make -j 3
 make package
 popd
 
@@ -29,4 +32,3 @@ hdiutil detach /Volumes/GPSBabelFE
 
 mv gui/GPSBabelFE.dmg gui/GPSBabel-${VERSIONID}.dmg
 
-